Cancel drag when the grab is shadowed. (#122688)

2006-11-06  Alexander Larsson  <alexl@redhat.com>

	* gtk/gtkdnd.c: (gtk_drag_begin_internal),
	(gtk_drag_source_info_destroy), (gtk_drag_end),
	(gtk_drag_grab_notify_cb):
	Cancel drag when the grab is shadowed. (#122688)

diff --git a/ChangeLog b/ChangeLog
index a0355ac9d1832ac38566e3abc213c9ec39a06cae..3f74b32ab6fede20f6a47e4db44a8967253bd0a0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-11-06  Alexander Larsson  <alexl@redhat.com>
+
+       * gtk/gtkdnd.c: (gtk_drag_begin_internal),
+       (gtk_drag_source_info_destroy), (gtk_drag_end),
+       (gtk_drag_grab_notify_cb):
+       Cancel drag when the grab is shadowed. (#122688)
+
 2006-11-01  Kristian Rietveld  <kris@imendio.com>
 
        * gtk/gtkcombobox.c (gtk_combo_box_class_init),

diff --git a/gtk/gtkdnd.c b/gtk/gtkdnd.c
index eaa95ddc692be7f33a70db78f6e3f21699b69e0f..3ebfd9c0b715284851906a4cb636d34c7f1fb753 100644 (file)
--- a/gtk/gtkdnd.c
+++ b/gtk/gtkdnd.c
@@ -285,6 +285,9 @@ static gboolean gtk_drag_key_cb                (GtkWidget         *widget,
 static gboolean gtk_drag_grab_broken_event_cb  (GtkWidget          *widget,
                                                GdkEventGrabBroken *event,
                                                gpointer            data);
+static void     gtk_drag_grab_notify_cb        (GtkWidget         *widget,
+                                               gboolean           was_grabbed,
+                                               gpointer           data);
 static gboolean gtk_drag_button_release_cb     (GtkWidget         *widget, 
                                                GdkEventButton    *event, 
                                                gpointer           data);
@@ -2331,6 +2334,8 @@ gtk_drag_begin_internal (GtkWidget         *widget,
 
   g_signal_connect (info->ipc_widget, "grab_broken_event",
                    G_CALLBACK (gtk_drag_grab_broken_event_cb), info);
+  g_signal_connect (info->ipc_widget, "grab_notify",
+                   G_CALLBACK (gtk_drag_grab_notify_cb), info);
   g_signal_connect (info->ipc_widget, "button_release_event",
                    G_CALLBACK (gtk_drag_button_release_cb), info);
   g_signal_connect (info->ipc_widget, "motion_notify_event",
@@ -3761,6 +3766,9 @@ gtk_drag_source_info_destroy (GtkDragSourceInfo *info)
   g_signal_handlers_disconnect_by_func (info->ipc_widget,
                                        gtk_drag_grab_broken_event_cb,
                                        info);
+  g_signal_handlers_disconnect_by_func (info->ipc_widget,
+                                       gtk_drag_grab_notify_cb,
+                                       info);
   g_signal_handlers_disconnect_by_func (info->ipc_widget,
                                        gtk_drag_button_release_cb,
                                        info);
@@ -3925,6 +3933,9 @@ gtk_drag_end (GtkDragSourceInfo *info, guint32 time)
   g_signal_handlers_disconnect_by_func (info->ipc_widget,
                                        gtk_drag_grab_broken_event_cb,
                                        info);
+  g_signal_handlers_disconnect_by_func (info->ipc_widget,
+                                       gtk_drag_grab_notify_cb,
+                                       info);
   g_signal_handlers_disconnect_by_func (info->ipc_widget,
                                        gtk_drag_button_release_cb,
                                        info);
@@ -4117,6 +4128,24 @@ gtk_drag_grab_broken_event_cb (GtkWidget          *widget,
   return TRUE;
 }
 
+static void
+gtk_drag_grab_notify_cb (GtkWidget        *widget,
+                        gboolean          was_grabbed,
+                        gpointer          data)
+{
+  GtkDragSourceInfo *info = (GtkDragSourceInfo *)data;
+
+  if (!was_grabbed)
+    {
+      /* We have to block callbacks to avoid recursion here, because
+        gtk_drag_cancel calls gtk_grab_remove (via gtk_drag_end) */
+      g_signal_handlers_block_by_func (widget, gtk_drag_grab_notify_cb, data);
+      gtk_drag_cancel (info, gtk_get_current_event_time ());
+      g_signal_handlers_unblock_by_func (widget, gtk_drag_grab_notify_cb, data);
+    }
+}
+
+
 /*************************************************************
  * gtk_drag_button_release_cb:
  *     "button_release_event" callback during drag.